# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1063.1.2 -> 1.1063.1.3 # drivers/char/agp/agpgart_be.c 1.41.1.14 -> 1.41.1.15 # include/linux/pci_ids.h 1.46.1.15 -> 1.46.1.16 # drivers/pci/pci.ids 1.37 -> 1.37.2.1 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/08/06 bjorn.helgaas@hp.com 1.1063.1.3 # HP PCI IDs: Add PCI root bridge, rename PCI-X and AGP root bridge. # -------------------------------------------- # diff -Nru a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c --- a/drivers/char/agp/agpgart_be.c Wed Oct 8 09:06:01 2003 +++ b/drivers/char/agp/agpgart_be.c Wed Oct 8 09:06:01 2003 @@ -5223,7 +5223,7 @@ agp_bridge.type = HP_ZX1; fake_bridge_dev.vendor = PCI_VENDOR_ID_HP; - fake_bridge_dev.device = PCI_DEVICE_ID_HP_ZX1_LBA; + fake_bridge_dev.device = PCI_DEVICE_ID_HP_PCIX_LBA; return hp_zx1_ioc_init(ioc_hpa, lba_hpa); } diff -Nru a/drivers/pci/pci.ids b/drivers/pci/pci.ids --- a/drivers/pci/pci.ids Wed Oct 8 09:06:01 2003 +++ b/drivers/pci/pci.ids Wed Oct 8 09:06:01 2003 @@ -1348,6 +1348,7 @@ 103c 1226 Keystone SP2 103c 1227 Powerbar SP2 103c 1282 Everest SP2 + 1054 PCI Local Bus Adapter 1064 79C970 PCnet Ethernet Controller 108b Visualize FXe 10c1 NetServer Smart IRQ Router @@ -1359,7 +1360,7 @@ 121c NetServer PCI COM Port Decoder 1229 zx1 System Bus Adapter 122a zx1 I/O Controller - 122e zx1 Local Bus Adapter + 122e PCI-X/AGP Local Bus Adapter 1290 Auxiliary Diva Serial Port 2910 E2910A PCIBus Exerciser 2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h --- a/include/linux/pci_ids.h Wed Oct 8 09:06:01 2003 +++ b/include/linux/pci_ids.h Wed Oct 8 09:06:01 2003 @@ -589,11 +589,12 @@ #define PCI_DEVICE_ID_HP_DIVA1 0x1049 #define PCI_DEVICE_ID_HP_DIVA2 0x104A #define PCI_DEVICE_ID_HP_SP2_0 0x104B +#define PCI_DEVICE_ID_HP_PCI_LBA 0x1054 #define PCI_DEVICE_ID_HP_REO_SBA 0x10f0 #define PCI_DEVICE_ID_HP_REO_IOC 0x10f1 #define PCI_DEVICE_ID_HP_ZX1_SBA 0x1229 #define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a -#define PCI_DEVICE_ID_HP_ZX1_LBA 0x122e +#define PCI_DEVICE_ID_HP_PCIX_LBA 0x122e #define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c #define PCI_VENDOR_ID_PCTECH 0x1042